Restore (optional) "old style" icon mapping for Geocaching on Garmins.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@3019 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c
index 6faaf9fe7d29872bfc5c1fa71d9acd56d88d9e82..57070d968d5d65af262f53453a2cfb652d11f957 100644 (file)
--- a/gpsbabel/garmin.c
+++ b/gpsbabel/garmin.c
@@ -734,6 +734,9 @@ waypoint_write(void)
 
                if (global_opts.smart_names && 
                     wpt->gc_data.diff && wpt->gc_data.terr) {
+#if 0
+xasprintf(&src, "%s %s", &wpt->shortname[2], src);
+#endif
                        snprintf(obuf, sizeof(obuf), "%s%d/%d %s", 
                                        get_gc_info(wpt),
                                        wpt->gc_data.diff, wpt->gc_data.terr, 

diff --git a/gpsbabel/garmin_tables.c b/gpsbabel/garmin_tables.c
index 4dadeae70d21d529eb04fb518591f4b3e8043ac0..11a064ad05f4d6a72a39a7b39f1391a729ea6e2c 100644 (file)
--- a/gpsbabel/garmin_tables.c
+++ b/gpsbabel/garmin_tables.c
@@ -184,7 +184,7 @@ icon_mapping_t garmin_icon_table[] = {
         * ....
         * {    -2,  8192, "Custom 511" },
         */
-#if 0
+#if 1
 /* Since Garmin is busily adding icons to new units, we have to hide
  * these so we can pass them through to the new entries.  6/2/07 robertl
  */

diff --git a/gpsbabel/util.c b/gpsbabel/util.c
index 3a24db4ff07cc6cf125750c5f77c1882aa894275..fc3e74e21b2aaaaeda6cbfed7f046ccc39dc5d24 100644 (file)
--- a/gpsbabel/util.c
+++ b/gpsbabel/util.c
@@ -897,6 +897,7 @@ get_cache_icon(const waypoint *waypointp)
                default:
                        break;
        }
+
        switch (waypointp->gc_data.container) {
                case gc_micro: 
                        return "Micro-Cache";
@@ -904,6 +905,11 @@ get_cache_icon(const waypoint *waypointp)
                default:
                        break;
        }
+
+       if (waypointp->gc_data.diff > 1) {
+               return "Geocache";
+       }
+
        return NULL;
 }